Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.10] Bugfix/restore folders recursively #6143

Merged
merged 4 commits into from
Oct 17, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #6134

we should not try to restore files/folders no longer synced because of
selective sync when detecting a data fingerprint change

in case the user deselect a folder from selective sync list, we would do
a local delete

in case the client is also detecting a change of data fingerprint (or is
stuck in restore mode) then instead of applying the new set of selected
folders to sync, it would upload unselected files/folders

Signed-off-by: Matthieu Gallien <[email protected]>
in case sync would complete after a data fingerprint change, we should
tolerate some errors

a file being blacklisted for whatever reason should not block the
propagation of data fingerprint

Signed-off-by: Matthieu Gallien <[email protected]>
@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.10.1 milestone Oct 17, 2023
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6143-3392933dc827bcbc47f58cb41b36c3494068496f-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@codecov
Copy link

codecov bot commented Oct 17, 2023

Codecov Report

Merging #6143 (3392933) into stable-3.10 (2b96501) will increase coverage by 0.07%.
Report is 1 commits behind head on stable-3.10.
The diff coverage is 100.00%.

Additional details and impacted files
@@               Coverage Diff               @@
##           stable-3.10    #6143      +/-   ##
===============================================
+ Coverage        60.46%   60.54%   +0.07%     
===============================================
  Files              145      145              
  Lines            18807    18807              
===============================================
+ Hits             11372    11386      +14     
+ Misses            7435     7421      -14     
Files Coverage Δ
src/libsync/clientsideencryption.cpp 37.93% <ø> (ø)
src/libsync/owncloudpropagator.h 65.35% <100.00%> (ø)
src/libsync/syncengine.cpp 79.91% <100.00%> (ø)
src/libsync/syncengine.h 65.00% <ø> (ø)

... and 4 files with indirect coverage changes

@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

75.0% 75.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@mgallien mgallien merged commit ead2907 into stable-3.10 Oct 17, 2023
11 of 12 checks passed
@mgallien mgallien deleted the backport/6134/stable-3.10 branch October 17, 2023 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants